t / t4135 / git-with tab.diffon commit merge & sequencer: turn "Conflicts:" hint into a comment (261f315)
   1diff --git "a/post\timage.txt" "b/post\timage.txt"
   2new file mode 100644
   3index 0000000..eff0c54
   4--- /dev/null
   5+++ "b/post\timage.txt"
   6@@ -0,0 +1 @@
   7+postimage